merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 1 Nov 2011 00:57:38 +0000 (09:57 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 1 Nov 2011 00:57:38 +0000 (09:57 +0900)
commitb851a434b003d8b1aec39dbeb75401e1cba9c9a9
tree5aaf6ee796f4fc1c9780fe68e555db929af1197e
parenta6faa3c208aced45b331bad3dc08b22ed0839219
parentae6bdbf6386dd0f287c1690873ac7f4a234bb2ab
merge trunk